From 1e3c2c1671cdf008cd7dab03c502e655b51953d8 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Wed, 25 May 2005 22:18:10 +0000 Subject: [PATCH] bitkeeper revision 1.1558 (4294f9a2Vif6PUYZMV6j1GuP-Mn6Xg) gcc4 build fixes. Signed-off-by: Keir Fraser --- xen/arch/x86/dmi_scan.c | 4 ++-- xen/arch/x86/genapic/es7000plat.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/dmi_scan.c b/xen/arch/x86/dmi_scan.c index 06f8c15a96..1d42756dc1 100644 --- a/xen/arch/x86/dmi_scan.c +++ b/xen/arch/x86/dmi_scan.c @@ -9,7 +9,7 @@ #include #include -#define bt_ioremap(b,l) __acpi_map_table(b,l) +#define bt_ioremap(b,l) ((u8 *)__acpi_map_table(b,l)) #define bt_iounmap(b,l) ((void)0) #define ioremap(b,l) (__va(b)) #define memcpy_fromio memcpy @@ -34,7 +34,7 @@ struct dmi_header static char * __init dmi_string(struct dmi_header *dm, u8 s) { - u8 *bp=(u8 *)dm; + char *bp=(char *)dm; bp+=dm->length; if(!s) return ""; diff --git a/xen/arch/x86/genapic/es7000plat.c b/xen/arch/x86/genapic/es7000plat.c index 58cc0bf610..8bf571bd27 100644 --- a/xen/arch/x86/genapic/es7000plat.c +++ b/xen/arch/x86/genapic/es7000plat.c @@ -149,7 +149,7 @@ find_unisys_acpi_oem_table(unsigned long *oem_addr, int *length) unsigned long rsdp_phys = 0; struct acpi_table_header *header = NULL; int i; - struct acpi_table_sdt sdt; + struct acpi_table_sdt sdt = { 0 }; rsdp_phys = acpi_find_rsdp(); rsdp = __va(rsdp_phys); -- 2.30.2